tree add6ebd7e7a58680b4076c6013965d8832b9dafe
parent ed7cdd6d6eb282ecd1c756a272811fd74b0437d1
parent e48d6d3f4e45ea333293ae12cab35ff84bc8345e
author Winson Chung <winsonc@google.com> 1630464006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630464006 +0000

[automerger skipped] Merge "Fix some issues with studio build" into sc-qpr1-dev am: e48d6d3f4e -s ours

am skip reason: Merged-In I4b96bedabcbe9d9c2d2f8ef394781616b83807ec with SHA-1 b0d25d2e93 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15731084

Change-Id: I35293f00d3783b562172d97757e25f4a7ef9a67e