Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692

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

Change-Id: I759d5787674a428ab85c5088df5a5637e0403f32