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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9fbfd47685385006a8963aad9c00866f59644c4