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

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



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