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

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



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