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

Change-Id: I7fe859210f5265927cf7448ff5254cd22f2cdcca