Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
am: c48ef6dda1

Change-Id: Id4d194f010c07d7d731238600f80dd18589a0358