Merge "Update haptics OWNERS" am: 0c3e42ebd3 am: 187ec0f00f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1853474

Change-Id: Ib6b78c0e15a63e31191f459082d0e5d8f4b17bb4