[automerger skipped] Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d am: e9691bdc94 am: bd62fc7dae -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883

Change-Id: I0d76ca4f1a0e08fbe0a3e356d6b439c2fecc0128