Merge "Using BaseIconFactory to draw legacy icon." into sc-dev am: 61d71ccaae

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

Change-Id: I55e6322b3df07fd54b0455d8de70c5a5875834b8