Merge changes from topic "aidl-freeze-tm" into tm-dev am: c13dea1094 am: ba7cf98651 am: 73942564c5

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

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