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