Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692 am: 84a37a092c am: 13b46d350b

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

Change-Id: If3b0e5ec7f8007540ad5cbf93bba09feafbc77ce