Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53 am: 56797fd5 am: 88b15818...

Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53 am: 56797fd5 am: 88b15818 am: e4001552 am: 80a6f299

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



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