[automerger skipped] Merge "Add new capability name." am: 381eb7a9 am:...

[automerger skipped] Merge "Add new capability name." am: 381eb7a9 am: 8ac87777 am: 4c021029 -s ours

am skip reason: Merged-In Ie0cc529c9154d6e3ac69d2d9e5a760a62bd7fe92 with SHA-1 b5095b2b is already in history

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



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