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: 3e7436fc am: 4e5a4124 am: 1ac2db28

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

Change-Id: I4e9e737dadb62b4d94d37e709679e80810a23be5