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

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

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