[automerger skipped] Merge "Use provided calling uid/pid for checking...

[automerger skipped] Merge "Use provided calling uid/pid for checking intercept-global-drag flag" into tm-dev am: 4ef3f4a3 am: fd4c7586 am: 1c58374e am: 18b50b5f am: 16598517 am: b144e78b -s ours

am skip reason: Merged-In I768dd22b9b107235cce60ffcc0e796d6a536b91d with SHA-1 467b1858 is already in history

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



Change-Id: Ic4760238494cbc3945e982b99601460c36a97a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>