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