[automerger skipped] Merge changes from topics "adtFunctionsNoBitMask", "audioArraysStaticCheck", "mvSystemAudioTests", "rmDeviceTypeBitMaskUsage" am: 8396d59e8b am: 7df2d4941c -s ours
am skip reason: Change-Id I85a794d1d8ce0994dff810d937d5ce7eaa15141f with SHA-1 6607c08207 is in history

Change-Id: I6c956372e17e120316ef8f446e2708526913f6e3