Merge changes from topic "free_up_space_card_preference" into sc-dev am: a23533cbdd am: 0dc2fde11e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14909652

Change-Id: Id9975e632d7eb3f0159aa4f1aa80ce92b7db5d78

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);
     }
-
 }