[automerger skipped] Merge "Add the process state prior to the activity start"...

[automerger skipped] Merge "Add the process state prior to the activity start" into tm-qpr-dev am: 42626d0a am: be4a82af -s ours

am skip reason: Merged-In I40d2517ac26eb48b5f466b1eefdbc0f833d58478 with SHA-1 6dd67732 is already in history

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



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