Merge "Use correct App info screen's trash can icon" into udc-dev am: d66335ae

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



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