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

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

Change-Id: I4f27beeec127bc7e194229aa7216e779e87242d4