Merge "Fix test breakage caused by adding new capability by default" am: 57d097e4 am: c7f337aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba52f2b470e28b7d6f28c1659eb3e3441f09daf6