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

Change-Id: Idfe377248ce22f16da0801111706fe936cf1cd8d