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

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



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