[automerger skipped] Merge "Add Binder.clearCallingIdentity to TracingServiceProxy" into sc-dev am: c46c9e644f am: 6d07377485 -s ours

am skip reason: Merged-In I472fe8acc2e59e93afd8475f51b5f347cd3ccc5d with SHA-1 3320b658ab is already in history

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

Change-Id: Ieab38ed671045872c657be8f43675a3e1c072d61