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

Change-Id: Id527fe8b5242ae6650446ce2993708463c08323b