[automerger skipped] Merge "Fix some issues with studio build" into...

[automerger skipped] Merge "Fix some issues with studio build" into sc-qpr1-dev am: e48d6d3f am: 6eaa5259 -s ours am: 17e01672 -s ours

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

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

Change-Id: I9a9723175e7990ee9f8d72db386dac2279522c84