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

Change-Id: I3b2ab7562623bb9441aa3343c6d1fd664df2aa7f