tree a5cbbb3740731d5f16d86059ab5f172fc9873fbe
parent e647036b895a4765859d926f5f072bbc5cf0a2eb
parent 216d5e7252168fef3d27f790b9e3bb33f6dc4c8a
author android-build-team Robot <android-build-team-robot@google.com> 1604503372 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1604503372 +0000

Merge cherrypicks of [12986203, 12985811] into studio-4.1-release

Change-Id: If35f32983cf3f28f747a15248e962e61d043bbf9