[automerger skipped] DO NOT MERGE Update Android.bp am: ba4c29ece4 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/15371872

Change-Id: I6ce30833c0692d2c9bbd593cb97840943bfc32af
tree: bf012f77ec9e7b0879225afadac9c4c561bc8d29
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS