Merge "Correct SensorPrivacyState if needed, prevent state from going bad" into udc-dev am: cc17b636c5 am: 7c4b1ca7a2 am: 90a777139c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22934997 Change-Id: I3fa073b8b03a31024240c57fc72028d9ba7e95b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: