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

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



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