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

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

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



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