Merge "Camera: Heic: Allow grids settings override in onFormatChanged" into...

Merge "Camera: Heic: Allow grids settings override in onFormatChanged" into main am: f41d09bd am: c0ff7da0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2684430



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