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

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



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