[automerger skipped] Merge "Retry: Add hidden API flags to...

[automerger skipped] Merge "Retry: Add hidden API flags to com.android.media-bootclasspath-fragment" into stage-aosp-master am: 3fafda3d -s ours am: a8bbe5f7 -s ours

am skip reason: Merged-In I4f4c97995136f326597ee996d4f84e2b34187d1a with SHA-1 c7629466 is already in history

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

Change-Id: Id1b3c1a92e6e679cf748cad086764418d5cd4ca0