Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev am: 0b152c29d0 am: 3ef895694d

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

Change-Id: I02078c493b6d952b5b52d7accd5b248c77d4e234