Merge changes from topic "aidl_freeze_tm" into tm-dev am: 7faedf81 am: a953bc3e

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



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