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

Change-Id: I40c5161ad262d6c8837206f04ef8874309bd5e79