[automerger skipped] Merge "Convert auto-brightness switch to a full screen UI." into pi-dev am: 16594545ff
am: 4837cd8bdd  -s ours

Change-Id: I31e71afa44e7d267c13bc75848d236d28856c6b3