Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

    private static final ArraySet<Surface> mEmptySurfaceSet = new ArraySet<Surface>();

    private String mLogicalCameraId;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage

    private CameraMetadataNative mLogicalCameraSettings;

    private final HashMap<String, CameraMetadataNative> mPhysicalCameraSettings =

            new HashMap<String, CameraMetadataNative>();