[automerger skipped] Merge "Clear binder identity in callback of IMS IPC...

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

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

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

Change-Id: Ia8787ebf45d9cfc024179200583e985dffe31899