[automerger skipped] Merge "Remove deprected capability API" into udc-dev am:...

[automerger skipped] Merge "Remove deprected capability API" into udc-dev am: a87fa51a am: 1e5c1286 -s ours

am skip reason: Merged-In I65b7a24ed0170233dd6f3cc85961d5b61de2f42d with SHA-1 a6485298 is already in history

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



Change-Id: I0bb83254128754a91efac084dc135df7e9265740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>