Merge "Add trace counter for target screen brightness." into oc-mr1-dev
am: 0ee6ea9e81

Change-Id: I7d8fb5ff124bbbe80fc5fe83b0c8c3920d9c6a77