[automerger skipped] Merge "[DO NOT MERGE] Move code to fix studio build" into...

[automerger skipped] Merge "[DO NOT MERGE] Move code to fix studio build" into sc-dev am: e77df8f5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6223d9a5909a6a2376dba75d9436199e2b9bcdbc