Merge "Add HWUI Sink to DM on Android Framework builds" into master-skia

https://skia.googlesource.com/skia/+/eebc39ad5a1dcbde1b10a9b2ab54679549522b52

Change-Id: I46945a3498e522ccde623a0041b36c3b167e9951