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

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

Change-Id: Ie3a4d8a28ce3f00fcb77304d1b9e7f19a0394def