Merge "Merge "Add VDM owners for ownership of virtual InputController JNI" am: ae418191 am: b112d342 am: 43339c0a" into udc-dev