[automerger skipped] Merge "Expose bitDepth to MediaMetadataRetriever" into...

[automerger skipped] Merge "Expose bitDepth to MediaMetadataRetriever" into tm-dev am: 99c5dbdb am: 36b1d5db -s ours

am skip reason: Merged-In I16dabdf9aaabf341a9cebb1624e464155196a5a8 with SHA-1 8166b9c2 is already in history

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

Change-Id: I9586ddb808055ddfb9a30eb1020461e84ec6dc20