[automerger] Fix some issues with haptic am: 29aef52be3

Change-Id: Icb16c1ee3828820187f023bd351e2a2720e9d300