Merge changes from topic "aidl-java-api-ci" am: 6f7ec05b

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



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