[automerger skipped] Merge "Add java_genrule to replace handcrafted api...

[automerger skipped] Merge "Add java_genrule to replace handcrafted api fingerprint generation" am: cfa332fb am: 8b949b56 am: f6874c76 -s ours

am skip reason: Merged-In Ib58f736ce43d877d0c08cdd9b154e93a1766105b with SHA-1 9a26363f is already in history

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



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