Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
am: 5daad21245

Change-Id: Ib220be0f72aab281187b0c3998c19c00a3ba26fb