Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe356

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



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