Merge "[automerger skipped] hiddenapi: Prevent libraries for Q/R from include...

Merge "[automerger skipped] hiddenapi: Prevent libraries for Q/R from include S+ flags. am: a80cc174 -s ours am: 0fa599ff -s ours" into tm-d1-dev-plus-aosp am: 033d4766 -s ours am: 2276733a -s ours

am skip reason: Merged-In Ie0f68482603adc7b4e3d7a5c81bf203d81a84a9e with SHA-1 a80cc174 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18089322



Change-Id: I6e2bd2ec504abd7cd0be28439d196c467f7a4f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>