Merge "Add the missing lock on the process start timeout handling" into tm-dev am: 9bcc7868

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



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