Merge changes from topic "aidl_freeze_tm" into tm-dev am: 18ba5370 am: a9d91110 am: edd58d48

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



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