Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b

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

Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed