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

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

Change-Id: I11ee0a8d6388f78a9db90756c0cbee93c923e1b8