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

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

Change-Id: I8ab622efb00db84ee37aae636d695ad20412a483