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

Change-Id: I430343e75be34e70b8e4ff3c4f08b73c1ae7b103