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

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

Change-Id: I755d889f1219f9104919bf88a0b481ff7b9b37cd