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

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



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