[automerger skipped] Add two missing comparison ops to HAL am: a26349a847 am: b1027ef021
am: 1c3c9631c8  -s ours

Change-Id: Idcbab17d048907214f3300ca9fa3b2b8006bf54b