Merge "Multizone readiness: add zone Id field in Product Strategies" into main am: 28df45e59d

Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/3067022

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