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

Change-Id: I44e6610b137fbe4b13a980b15517b6303de51077