Merge "Merge "Merge "Remove references to undocumented...

Merge "Merge "Merge "Remove references to undocumented WHITELIST_AUTO_REVOKE_PERMISSIONS from javadoc" into rvc-dev am: d99b74a9 am: 038d147e" into rvc-d1-dev-plus-aosp am: 6a6e1594" into rvc-qpr-dev-plus-aosp am: 7da037e5

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

Change-Id: I04c94d4e1e9221de810846da4a5240c97185f52f