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