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