Merge changes from topic "aidl_freeze_tm" into tm-dev am: 118b6a3c am: 1fdfc856 am: dc88f32e

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



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