Merge "Add log metrics for Aware Display Settings" into qt-qpr1-dev
am: 2ee661e584

Change-Id: I74c79ceaac3ad51c434706d37aa4f28cb60ceadf