Merge changes from topics "soong-apilevel", "soong-config-apilevel" am:...

Merge changes from topics "soong-apilevel", "soong-config-apilevel" am: 8bd50953 am: 587f425a am: eee05b3d am: 2be28db3

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

Change-Id: I7135c8e3b2cef029a4ced8874a2efe62923ca244