[automerger skipped] Merge "Tweak preference layout padding" into sc-dev am:...

[automerger skipped] Merge "Tweak preference layout padding" into sc-dev am: 907fbba2 am: 3a46f466 -s ours am: 903f5380 -s ours

am skip reason: Merged-In I421159fbc056aed4b4895a30fcfcafeb1e836da3 with SHA-1 2d233feb is already in history

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

Change-Id: If43e637b2b26f70a576ff30995e660a6ce53f303