Android Studio 4.1.0 (6858069)
Merge cherrypicks of [12670916, 12670917, 12670918, 12670919, 12670553, 12671132] into studio-4.1-release

Change-Id: I8d65de41476d926c82638f7c32215dcb0e53384b