[automerger skipped] Fold in MinSdk/RequiresApi for mainline newapi lint am: ba3a45dde5 am: 9354ab107b am: cc95bbf27a -s ours

am skip reason: Merged-In I5eabe631ff441ea3af85b2664b6a57647e1a684e with SHA-1 8060b2a78a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2015915

Change-Id: I7d9ba43c9d150b57631212c0ccc42a320c378ee2
tree: 6a328778d4d8f022f94fed0a89e60d923242dd6b
  1. apex/