Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev am: 43999195e9
am: d3a10f5bfd

Change-Id: Ifb16f023345ac90dffaab9f63ca0189dc8bb0e3f