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

Change-Id: I8bf76bd42a41055ec7e7b9352dce5577a381540c