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 am: 12134195

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



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