tree 8f9183232165d51e1b6bbbcdc64e0152d0c36fa9
parent 8100a960b9adcf38f3924e79989822723da5361e
parent 1e0ce0d17d0d0db10ce0253b8ff3ab0d6c27423c
author TreeHugger Robot <treehugger-gerrit@google.com> 1628793730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628793730 +0000

Merge "Fix boot loop when upgrading sensor privacy file" into sc-dev am: 66d5c60581 am: 1e0ce0d17d

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

Change-Id: I1d4cbcddc71cdeb96f290b689e037bda007aad6a