Merge "Convert merged srcjar rule to Android.bp" am: 9c176432be am: aff360c512

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

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