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

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

Change-Id: Ic7666e2e3acecfd1545b5907cd7c04b730e313a0