Merge "Reformat Android.bp file" into main am: a746472cb4 am: 4e69c0c311 am: 74c92498aa

Original change: https://android-review.googlesource.com/c/platform/development/+/2842863

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