Merge changes from topic "am-3bddd89fd6b84d1b8c5e5210dcfc3870" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94
  [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b am: 43834d78ff am: 44ce07125a