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: Ibf7b578d235ad7b5ccdbe16098769f8806aa96ad