[automerger skipped] Merge changes from topic "aidl-java-api-ci" am: 6f7ec05b am: ddc5cf90 -s ours am: 0fb49b04 -s ours am: d10a11f7 -s ours am: ed0da90e -s ours am: 6426d1e0 -s ours

am skip reason: Merged-In I274f847ed8156acd0c4b288e306fcab2d380bcd5 with SHA-1 32d2c1bf is already in history

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



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