Merge "Retain ID mapping for product strategy to be optional" into main am:...

Merge "Retain ID mapping for product strategy to be optional" into main am: 87a22b0f am: 9ac9e44c

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



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