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

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

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



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