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

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



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