Merge "Fix Android.bp formatting" into main am: d51c6c799f am: 83182e1768

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3344457

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