Android Studio 2023.2.1 (11479570)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25806528'] into studio-iguana-release.

Change-Id: I7f5a1a49609bdd1a1d2f60f076e62f011d714847