[automerger skipped] Merge "Add explicit exported tags" into stage-aosp-master am: d90545703f -s ours

am skip reason: Merged-In Ifd07672da0141c74ad32613a17691c6cd09e54de with SHA-1 c82a810842 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15826733

Change-Id: Ifb211573dca64469608cceef5a030e9752bb4ab7