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

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



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