Merge "Fix cannot find removeUnwantedCapability on R device" am: 5b477acbbe am: ca8859da58

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

Change-Id: Ia574c52344290f5baf5fbee90ed1f6f7c7e0f92c