Merge "Add handle suppression to learned state" into qt-dev
am: 079d81a479

Change-Id: I333ba403981edbc002246910636620a311a1f55e