Merge "Differentiate between public and module-lib stub variants" am:...

Merge "Differentiate between public and module-lib stub variants" am: 9e1117bf am: c78c3742 am: 6278923e

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



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