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

Change-Id: I2d42093a1f129a4de1d537490cddfbe6ade8ca86