Merge "Merge "Update Java doc of SensorManager.createDirectChannel" into oc-dev am: 17e641da am: 6c5ee3d8" into oc-dr1-dev-plus-aosp