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: I8cd4adee85fce1f70d6ea53716ca91684249f06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>