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

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

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