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

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

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



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