Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b am: 38658a5658 am: 30d0c52c6a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: Ie936c09e70c22558cffdfae4648b99291a4d1c80