Merge "Camera: Register LensShadingMap marshaler" am: 238f1e28fa am: a25279e262

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

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