[automerger skipped] [DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
am: c30c0c381c
am: e92c41ee14
-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: I6c02289fc7911d226e37e4f3237e166ed1c4fa14
This commit is contained in: