Merge "Remove use of androidprv to work around a bug in sysyui studio build"...

Merge "Remove use of androidprv to work around a bug in sysyui studio build" into sc-dev am: 4b419f08

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

Change-Id: I3946a957f13dbf107525e2eabd7853c02f57bf51