Merge "AOD: Hide owner info on ambient display" into oc-dr1-dev am: 6c5ce43b39
am: 6dfd8aa791

Change-Id: Ib04c87888bf7979f9c81ac730364307348676223