Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186d am: a679d688

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



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