Merge "Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev am: 7b0a3be am: eb4ef24" into nyc-mr1-dev-plus-aosp