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: a940158c am: a74c0923

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

Change-Id: Ie5ee121873fce3ffa0d009b314b2c348df77a5ff