Merge "Camera: Use fallback key if the requested key returns null" into pi-dev
am: 062c050d01

Change-Id: If26bfe174dcc91e52ffae386041a9215c87316f8