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

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

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