[automerger skipped] Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b am: f85195ae06 am: b5d62d1f83 -s ours
am skip reason: skip tag Change-Id Icf2cda325795acee22a6c634e8d978f64c5ac3cb with SHA-1 8428118d0f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302
Change-Id: I74d0e6ea112c4714c09a12f908fb9273c8477584
This commit is contained in: