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 am: a0f4c825

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



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