Merge "Camera: Address an issue that the invalid memory is accessed" into udc-dev am: 36d5df64 am: 61da9dc1 am: d0f28a23

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



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