Merge "Merge "idmap2: Set aidl_return to true on success" into rvc-dev am: 6700d5e4 am: 94dbd5dd" into rvc-d1-dev-plus-aosp am: 7eb0995d

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

Change-Id: I9c5cad0940fa551573853197746c349fdecad989