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

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

Change-Id: I608e347c9f6bae30be9559736a32f2241d9d9a90