Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40  -s ours
am: fd770e1cb8

Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99