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

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

Change-Id: Ibfd0d61256b814f557223cf64c6a6eef8b180ed0