Merge "Using BaseIconFactory to draw legacy icon." into sc-dev am: 61d71cca am: 36b1a179 am: 501770e9

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

Change-Id: I9eb7cd39882c197f3eba017129bb733bc743fec1