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 am: 6ba55d65
Change-Id: I648e51bb8313c065b77474dd40ab1f27d951ba55