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

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



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