Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7fac am: a3103b1c

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

Change-Id: Ieb9fe3b91e879ef38faaa83f95f851cdb081c4e9