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

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



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