Merge "Recreate media controls when style changes" into rvc-qpr-dev am: 36083cf877

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

Change-Id: Ic2d7525e71109ebdb7cadfaf91532a205d941a44