Merge "Remove temporary double icon workarounds" into udc-dev am: d38421d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051003



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