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

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

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

Change-Id: I15e71ce70c7f13c2f1ab64449cadead5c3bf5be3