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

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

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