Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am: 66d5c605 am: 1e0ce0d1 am: 577a74da

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

Change-Id: I6aec3eec9bae32ed9ebc7799955dae369d9000ce