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

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

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