Merge changes from topic "tm-qpr-proc-start-triggers" into tm-qpr-dev am: a04b35b6

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



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