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

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

Change-Id: I27be218121e1e85203d151efdaf66b24b0d5a4e0