[automerger skipped] Merge "Migrate haptic to view model and out of legacy components." into udc-d1-dev am: ab3031734a am: 7814711902 -s ours
am skip reason: Merged-In Ie7181b448b74e4f7322cfad59eced1ac872a9b85 with SHA-1 3b9e125c9f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23987611
Change-Id: Ibfe25173321ed48de89f00b887eb21157b86ad82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: