[automerger skipped] Merge "Clear binder calling identity before calling...

[automerger skipped] Merge "Clear binder calling identity before calling callback" into sc-dev am: 520eb408 -s ours am: 81706ad4 -s ours am: e04b2a8a -s ours

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

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

Change-Id: I892e4ac8b85431f90ae3e821eab008c2989f3e76