Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev
am: 30a416fdea

Change-Id: I239e7cd8697f8015295ccda938eed9c3f9a0c01d