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

Change-Id: I6e838fae7cdb2cffab830c73db0c09a5d246437a