Merge changes from topic "aidl_freeze_tm" into tm-dev am: 18ba537008

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

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