[automerger skipped] Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev am: 4696dc9bf8 -s ours

am skip reason: Merged-In I34225e32111879e155c9f7865f0045430d171467 with SHA-1 c18002c465 is already in history

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

Change-Id: I07c075ad89564d5d29c0dec2883533e37a7e8316