Merge "Camera: fix filter logic for depth only camera" am: fe610f0fa3
am: 20b576efd0

Change-Id: If7a97849e8e40f2525824a27a0489dce3c746eae