Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b

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

Change-Id: I11ee0a8d6388f78a9db90756c0cbee93c923e1b8
tree: f992251862a5346482464fe7b72545edf674ed9c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING