Merge "Add logging constant to track settings entity header clicks" into oc-dr1-dev
am: 4d932f1e7a

Change-Id: I10fa5eb52d09232e6bd33caae5fdb50a3b88e48c