Android Studio 2021.1.1 (8092744)
Merge cherrypicks of [15820275] into studio-2021.1-release.

Change-Id: Ib6ac732cf94a04ae0afd9285dd88f88a8dd9acd5