Merge "Don't show sensor use dialog for system uid" into sc-dev am: eaed2068 am: 8f7b2f0a

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

Change-Id: I1ccd3105d9c6dfb6953ae37698fdee9783cde933