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

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

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