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: e658eeb3 am: 77922123

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



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