Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am: 66d5c60581 am: 1e0ce0d17d am: 577a74da8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15529225 Change-Id: I6aec3eec9bae32ed9ebc7799955dae369d9000ce
This commit is contained in: