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