[automerger skipped] Merge "[DO NOT MERGE] Support toggling resumption in...

[automerger skipped] Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7fac am: edfb2edd am: dcbdf550 am: 5a8d0f3d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1c1b82d2318c36cbc9d41bf5b38d7c504e875a39