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

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



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