Merge "Reset media controls when user changes" into rvc-dev am: 4e86ccd2 am:...

Merge "Reset media controls when user changes" into rvc-dev am: 4e86ccd2 am: ba9d30d6 am: 46580d2c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813680

Change-Id: I6fcd9d266cc27be1d22105732abb9bb763d06c1b