[automerger skipped] Merge "Add new capability name." into tm-mainline-prod am: 22198659 -s ours

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

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



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