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

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

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