Merge Android Studio 4.0 (aosp/studio-master-dev)