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

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

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