Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7fac am: edfb2edd
[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307b am: 7a2dfd34