Merge changes from topic "free_up_space_card_preference" into sc-dev

* changes:
  Tweak UI of CardPreference and ContextualCard
  'Free up space' uses CardPreference

tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java

@@ -45,5 +45,4 @@ public class CardPreferenceTest {
     public void getLayoutResource() {
         assertThat(mCardPreference.getLayoutResource()).isEqualTo(R.layout.card_preference_layout);
     }
-
 }