Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am: 66d5c605 am: 05fdfa87

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

Change-Id: I9b70d84ad486a742aa87fc8d00785c893283eacc