[automerger skipped] [DO NOT MERGE] Move code to fix studio build am: 123a85fda1 am: 7f748ce86c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14806659 Change-Id: I4431c7c94abc562ea4b8dad7dcb9095ba3a34005
This commit is contained in: