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

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

Change-Id: I7cc4a68035194b5fbc22497079005c448a408e7f