tree 4b59191a8932d85069543cfc4e33a9aa883c223c
parent ee28d79784fa52b8c3ff557a22cead2d4f94c16f
parent 0d942e81c786e45464bd9ad6a52f40cd742e3221
author Lorenzo Colitti <lorenzo@google.com> 1620810930 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620810930 +0000

Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7

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

Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863