[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: a3103b1c am: 639f9479 am: e639ec76 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I39939ac4b38544c5cfbab0b74b3eacc541c73283