Merge "Merge "idmap2: Set aidl_return to true on success" into rvc-dev am: 6700d5e4 am: 94dbd5dd am: 26f28f4e" into rvc-qpr-dev-plus-aosp am: 3a45ae5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795074

Change-Id: Iabe39fd42ea93988c1967b6c2aeb0e39c4004ebb