Merge "Update Camera2 for guava 27.1" into qt-dev-plus-aosp