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

[automerger skipped] Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe356 am: b56de4b6 am: 600c3beb -s ours am: da587408 -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: Ia453ee1a74bd8a6216f0034a935e45117f1424e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>