Merge "Fix AudioProductStrategy.equals implementation" into udc-dev am: c4f75912 am: 1ebbeba4 am: 3964e366 am: 7cc5de17

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



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