[automerger skipped] Merge "Add android:exported tag" into sc-dev-plus-aosp...

[automerger skipped] Merge "Add android:exported tag" into sc-dev-plus-aosp am: 15296de7 am: f7f3cf74 am: 8b881e44 -s ours

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

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

Change-Id: I09b2f35cd3c3b2335823b18310cd8a5a33a87dfc