Materal style backports/fixes am: 5826dca8b0 am: 2ea9f11930 am: 9cc96458a7
Materal style backports/fixes am: 5826dca8b0 am: 2ea9f11930
am: 9cc96458a7

Change-Id: I27c9641314ddd9a664d1cbca80e04461d0b08568

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