Merge "Fixing studio build due to androidprv" into sc-v2-dev am: 13e33418 am: 32e27a9b

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

Change-Id: I0fe99c5e2bee26a54fcccc7993c0dfc3284a9c5f