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

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

Change-Id: I1fd6ff7292ae24eb4f7cedc0f21e6329ad2a68a8