am 4068f3d3: am 7cf831bf: Merge "MediaRouter: Keep right padding if play/pause button is missing" into mnc-ub-dev
am 4068f3d3: am 7cf831bf: Merge "MediaRouter: Keep right padding if play/pause button is missing" into mnc-ub-dev

* commit '4068f3d39402919c2ac24d0bea9dd3033e8e84c0':
  MediaRouter: Keep right padding if play/pause button is missing

aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,AndroidX/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support