Merge "Camera2: Handle eviction case in BlockingCameraManager" into pie-cts-dev