Merge "Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-dev am: db8eb301" am: ac7fbf24 Change-Id: I7fe859210f5265927cf7448ff5254cd22f2cdcca