Merge "Merge "Deprecate docs for auto revoke manifest and Intent APIs" into...

Merge "Merge "Deprecate docs for auto revoke manifest and Intent APIs" into rvc-dev am: c43f49df am: 5ec84ee3 am: de433322" into rvc-qpr-dev-plus-aosp am: 1a593e5e

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

Change-Id: If4436bcd35962f297dbe12e147fcb6462007306f