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

[automerger skipped] Merge "Tweak preference layout padding" into sc-dev am: 907fbba2 am: 390624e6 am: 3e0923c5 -s ours

am skip reason: Merged-In I421159fbc056aed4b4895a30fcfcafeb1e836da3 with SHA-1 97d17d41 is already in history

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

Change-Id: Id953fa3eb53892e9bccba8c4004a79dba971ef40