Merge "Check for progress info from resume controls" into tm-qpr-dev am: ad6b846c am: 7a1cc081

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



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