Merge "hiddenapi: Prevent libraries for Q/R from include S+ flags." am:...

Merge "hiddenapi: Prevent libraries for Q/R from include S+ flags." am: a09d95f6 am: c06a700d am: 64d5a525 am: 86f5fa8d am: fcad4f14

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



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