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: e529915e

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

Change-Id: I425fffb7a68e314ca7a53322ff38ee125c4273ed