Merge "Merge "Dismiss media if paused for more than 10min" into rvc-dev am:...
Merge "Merge "Dismiss media if paused for more than 10min" into rvc-dev am: d1b50a9c am: 37f7a2f1" into rvc-d1-dev-plus-aosp am: b6ca9f7f
Change-Id: Id4a07f82768f4b07d77c96869f29cb4f366cccf2