Merge "Fix some issues with studio build" into sc-qpr1-dev am: e48d6d3f

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

Change-Id: Idcfad6332a26bfb2654d746047c037acaca6843f