Merge "Add new capability name." am: 381eb7a9c9 am: 8ac87777ba

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

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