Merge "Check for flag to trigger resume" into tm-qpr-dev am: b8b7a230 am:...

Merge "Check for flag to trigger resume" into tm-qpr-dev am: b8b7a230 am: 19c9d221 am: 52a61a8b

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



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