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

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



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