[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 skip reason: skip tag Change-Id I70f0dd7dffaa14730ebc96c0e9c7f82bbe36bb9f with SHA-1 0cdc55bc is already in history

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

Change-Id: I73955d3078c20983d05bedda3fa98bfe2d560766