Merge "Relax angle-related false touch classification." into pi-dev
am: 7f3e5bb053

Change-Id: I50cfd5c0caef979479f6880b163317261c57c997