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

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

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