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

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

Change-Id: I8cdfc4024e4eadeb4c8f4cfe97d0b01f4a6cf681