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

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

Change-Id: I9f3a3b4587324009bcd3cd81012624a686d09be9