Merge "Fix the padding for top intro preference" into sc-dev am: 5565da2a am: 69b2507b am: 2fb5de76

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341150

Change-Id: Ib878dcc66625a2329880f0f8f59c3eb6cc69f231