[automerger skipped] Merge "Tighten up Binder.clearCallingIdentity() usage." am: 1fe717a58a am: c608a3e283 am: 9ba5d3edbb -s ours

am skip reason: Change-Id I832c9d70c3dfcd8d669cf71939d97837becc973a with SHA-1 2d2e07e2ff is in history

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

Change-Id: I5eecd6d2e818c2721583fc3d50f3fc1b9a3e96d0