Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Support toggling resumption in Settings" into rvc-dev am: ab9e7fac am: a3103b1c am: 639f9479
[DO NOT MERGE] Support toggling resumption in Settings am: c1bc307b am: b11486a9 am: 1ec1cb0a