Merge "Add support for HW privacy toggles in sensor unblock dialog" into tm-dev am: 9d0392bc am: b98f8786

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



Change-Id: I3365ae866ed214588dedfaa4a7e216d567d6617d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>