Merge "Add support for HW privacy toggles in sensor unblock dialog" into tm-dev