Merge "Added screen brightness override feedback." into pi-dev
am: 6ddaed5efd

Change-Id: Id73dbb9fc8286865d0bb78949f8abb585defa483