Merge "Merge "Fix AudioProductStrategy.equals implementation" into udc-dev am: c4f75912 am: 1ebbeba4 am: 55f5fe7c" into udc-qpr-dev-plus-aosp am: e1193946

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051408



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