Merge "Add the missing lock on the process start timeout handling" into tm-dev...

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

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



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