[automerger skipped] Merge "Set dist_group: "android" for frameworks/base...

[automerger skipped] Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" am: 4952525b am: 17dc8850 -s ours

am skip reason: Merged-In I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad with SHA-1 fe090912 is already in history

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

Change-Id: Ibeb1f2a0e83ef90f3ce095b6e8db9c41b9f5ec8c