Merge changes from topic "aidl-java-api-ci" into tm-dev am: b8b05de2 am: ccb2ce7d

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



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