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: I5a4ab99d22e38f2e00dd3b9550d21550a8a667f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>