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

Change-Id: I9ee55a65e44ff8485d292f7e00cc0b03a6e31a48