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

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

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