Merge "Camera: Heic: Allow grids settings override in onFormatChanged" into main am: f41d09bd7f am: c0ff7da06e am: 655a642b92 am: 16962108a4

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

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