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

Change-Id: I6cc3e46a5c1f112b3bc27239571aa5f6ff7f9a0e