Merge "Camera: Fix null pointer exception in onResultReceived" into udc-qpr-dev am: 4c3db108

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24589333



Change-Id: I30f07fdc73515de3554f1e63a9000413c3c2102e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>