Merge changes from topic "aidl-java-api-ci" into tm-dev am: b8b05de2 am: 9d3dc0cd am: 5b61c10b

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



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