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

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

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