[automerger skipped] Merge "Fix cannot find removeUnwantedCapability on R...

[automerger skipped] Merge "Fix cannot find removeUnwantedCapability on R device" am: 5b477acb am: ca8859da am: cf8c92b0 -s ours am: e380ff11 -s ours

am skip reason: skip tag Change-Id Icf2cda325795acee22a6c634e8d978f64c5ac3cb with SHA-1 ffc922fe is already in history

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

Change-Id: Icebdc6e6b921c10331d79352a5c56b6de4326f3d