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

Change-Id: Idd6054c7abf169d84c80e5493eba331c917e3f25