Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f am: 0368be45" into nyc-mr2-dev-plus-aosp