[automerger skipped] Merge "Update javadoc for...

[automerger skipped] Merge "Update javadoc for Intent.ACTION_VIEW_PERMISSION_USAGE" into mainline-prod am: 624e605b -s ours am: 6669265c -s ours am: 2d5742cb -s ours

am skip reason: Merged-In I70f0dd7dffaa14730ebc96c0e9c7f82bbe36bb9f with SHA-1 92b204d8 is already in history

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

Change-Id: I9a9a3386b76b1fcf54939bf01e6923e761da92ba