Merge "Removing extra haptic feedback. am: 7660bca509 am: 60c32b1f15" into nyc-mr1-dev-plus-aosp
am: c7a7aa1f17
* commit 'c7a7aa1f17553dfa6ef30934d40215600710ea87':
Change-Id: I42e28b60ef1d01ce39961ef10c49fd9af6c1a0cd
This commit is contained in: