Merge changes from topic "reland_hidl_mapper_removal" into main am: 8faa4a58 am: 61fc9636

Original change: https://android-review.googlesource.com/c/platform/build/+/2828695



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