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

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

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