Merge "Rename unwanted capabilities to forbidden capabilities." am: 5a31cd4f am: 0bcf2d14 am: 597471e4 am: 4da73c1b

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

Change-Id: I34ec7ff698d0a5e73548c02853d57bc17313c812