Merge changes from topic "aidl-freeze-tm" into tm-dev am: c13dea10 am:...

Merge changes from topic "aidl-freeze-tm" into tm-dev am: c13dea10 am: ba7cf986 am: 3a099c83 am: cad0801c

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



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