Merge "Reduce lock contention of setting running shell remote transition" into...

Merge "Reduce lock contention of setting running shell remote transition" into tm-qpr-dev am: 86725073 am: 97f7858b

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



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