Merge "Revert "camera2 jni: nativeReadValues() can use camera_metadata_ro_entry instead of camera_metadata_entry"" into main