Merge "Added AndroidStudio 4.0 Canary1 for Mac" into androidx-master-dev