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

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



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