Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev am: 63f23f8dd7
am: ed9d7e2c98  -s ours

Change-Id: I049efa9dd78faa0119424c9bc40ff7343825ca18