[automerger skipped] Merge "Add android:exported tag" into stage-aosp-master...

[automerger skipped] Merge "Add android:exported tag" into stage-aosp-master am: 11c9e3df -s ours am: 6147839b -s ours

am skip reason: Merged-In If1d8974150e14421a977674af7f0b0230af0e0be with SHA-1 95ab3e64 is already in history

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

Change-Id: I89655c9bf1569463226280671f73813d21d27b8e