Merge "Using BaseIconFactory to draw legacy icon." into sc-dev am: 61d71cca am: 22bfc66d am: 16f77d6a

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

Change-Id: I3ecdb442c9e6c45675ea4250b2497bf15985c515