Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev...

Merge changes from topics "b124224342", "change_procstate_flag" into tm-dev am: 45081ab6 am: 63a299ec

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



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