Merge "Differentiate between automatic and manual brightness in metrics." into pi-dev
am: 4d1390e4d7

Change-Id: I5ece2e528989b4a4a55660ee7fd9c01df992fbee