resolve merge conflicts of 15b43e96 to stage-aosp-master

Test: multihal compiles
Change-Id: I744793517b150f65c702a846f47c067b2f01f8a3
diff --git a/modules/sensors/OWNERS b/modules/sensors/OWNERS
new file mode 100644
index 0000000..1af3506
--- /dev/null
+++ b/modules/sensors/OWNERS
@@ -0,0 +1,2 @@
+pengxu@google.com
+ashutoshj@google.com