Merge "Merge "Remove references to undocumented WHITELIST_AUTO_REVOKE_PERMISSIONS from javadoc" into rvc-dev am: d99b74a975 am: 038d147eab" into rvc-d1-dev-plus-aosp