Merge "Add PlusMergesAA GM" into master-skia

https://skia.googlesource.com/skia/+/7005a57c545811b13ed141bac3ef12cb4a94f329

Change-Id: Idadd6ee1566e5ebac4481707289e8f50c80d8c40