Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
am: e1c20560d4
am: 17f03413f9
am: d7ae5ee813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789 Change-Id: Iaeda94562a0ced5381a6a0735cc01e6b76ecf2de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: