Merge "Fix some issues with studio build" into sc-v2-dev am: 95ae7391 am: 777db522

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

Change-Id: Iad869227989664e8214e21ee72e07e360d1ddd87