Merge "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" into rvc-qpr-dev-plus-aosp am: 3f5b5ca9

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

Change-Id: Ia32a36cb80313a0f6b802f3ae8be671194d44005