Merge "Remove apex10000_private variants" am: 9c58a362 am: 74810ac1 am:...

Merge "Remove apex10000_private variants" am: 9c58a362 am: 74810ac1 am: 81de7684 am: bdd74883

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



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