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

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



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