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

Change-Id: I1c26db45f1e33e7b03ed0e22b8868cca51e55e27