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

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

Change-Id: I0d89458eb33f00380f3e1bbe5c31d32d42b3c2e7