Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev
am: 51cf32b4f3

Change-Id: If618d57c6444c874d1d6037c332cbae4c3cf01a6