Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
am: 76e0cb6678

Change-Id: I02c1b2451ad75b9a10b2e7bd83089cfd1a5c9c94