Merge "Fix broken docs in media" into main am: 70b2c38693 am: c5646f2f5d am: cf8c162717 am: 9359d546ac am: d82c90f475

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

Change-Id: I4fe07430d43973923eadf3a315e8bde6b14aa686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>