[automerger skipped] Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev am: 51cf32b4f3
am:4a75a20232-s ours am skip reason: change_id I729f4905c94698c95733570abe92ca3ba9163cc5 with SHA167bd78ad73is in history Change-Id: Ic8f9f6e4aeeafeda60b8a680f9ba6b18f4afbeab
This commit is contained in: