Merge "audio_gain_config_are_equal: Treat mode as mask" am: 889727c9bc

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1526989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9494f94bac938f45a41b2a7ebe68e821b88ddbb5