Merge "Fix Other default preferences alignment" am: c73dfdb858 am: 18e2057de2

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

Change-Id: Icd2c470bbbc7144404b513beef5c6785eab8ca86