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

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

Change-Id: I9fcfd474b0cebdbadaad9466f5fb15b0069b55e6