Merge "Revert "Camera: Use fully qualified name for camera eviction logic"" into pi-dev am: 67f280ee7f
am: bd37a2d6e1

Change-Id: Iecdebccc1d19ab4d7dc764a1cd7381f5121e7c24