Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae am: efe89394...

Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae am: efe89394 am: 4ee3891c" into udc-dev am: a104f2a9

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



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