Merge "Reserve the icon space to avoid preference padding change" into tm-qpr-dev am: b9b1225a

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



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