Merge "Update contexthub OWNERS"
am: 9d71718e40

Change-Id: I2a125cafb0569b43d29cab49feb433edf098a5b6