Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b...
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b am: 206f1ef0" into oc-dr1-dev-plus-aosp
am: b5903659
Change-Id: I42707bee7d8695021c2f3e41ad6e703b49f8a757