Merge "Limit number of resume controls" into tm-qpr-dev am: fbdca37414 am: 2d3da818e0

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

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