Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am:...

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

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

Change-Id: Id4c37bf826c43d95a4036eb94e9a5729f947af49