Merge "Make 'art' tool default to passing -XjdwpProvider:none"
am: 1bcec123c5

Change-Id: Ia9d4dd69284c00ad1a1622ce89cf882c775d7086