[automerger skipped] Merge "[MediaProjection][Security] Consistent locking on...

[automerger skipped] Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe356 am: 19d4bc37 -s ours am: af3b7d1e -s ours am: 58fc7070 -s ours

am skip reason: Merged-In I12506081e1d173e8210ff29ef3992c3bfcf82841 with SHA-1 f7634d8d is already in history

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



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