Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 5e6f05a533
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: a648d121b7