am 250aa068: Merge change Idf7fafd3 into eclair

Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-plus-aosp

* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
  Fix issue #2248951: Need to turn off touch filtering outside of sholes