[automerger skipped] Merge "Clear binder calling identity before calling callback" into sc-dev am: 520eb40850 am: ff28d4f747 -s ours

am skip reason: Merged-In I21f14e40a05f76346eb90b8f36608b4d6bdf1a29 with SHA-1 bc02830a59 is already in history

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

Change-Id: Icdbe1569c81fba09575630dab8494366da6b8193