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

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

Change-Id: Ib88fdf8b520fee89c7564a9b2775129a3602d734