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

Merge changes from topic "aidl-freeze-tm" into tm-dev am: c13dea10 am: ba7cf986 am: 73942564 am: 0d1b578e

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



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