Merge "Fix test breakage caused by adding new capability by default" am: 57d097e484 am: c7f337aa82 am: 4bd945cc2a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iada02af25322fc4b3dad14ec1802372eeabccfac