Android Studio 2020.3.1 (7583922)
Merge cherrypicks of [15392998, 15392999, 15393000, 15392965, 15393020, 15393036] into studio-4.3-release

Change-Id: I70cc181d11cd7d02123eee660e9748f247fb69d4