Merge changes from topic "aidl_freeze_tm" into tm-dev am: 18ba5370 am: 75b4f8a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17776586



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