Merge "camera2: Fix CameraMetadata#getKeys" into klp-dev