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

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



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