Merge "Padding and color fixes to align with mocks" into udc-dev am: c58258e459 am: 63bc3b516c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23440516

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