Merge "Fix wrong glifLayout padding for tablet resolution" into tm-dev am: 4d1e3274

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



Change-Id: Iba1caf88eff20ea946c5869a9f862c8dac7f3350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>