Merge "b/2491823 Fixed brightness toggle for phones w/o auto-brightness"