[automerger skipped] Merge changes from topics "adtFunctionsNoBitMask", "audioArraysStaticCheck", "mvSystemAudioTests", "rmDeviceTypeBitMaskUsage" am: cc825811 am: 18ac98a0 -s ours
am skip reason: Change-Id I0374f382eaab7b36ab623b11a59e0634565f2187 with SHA-1 b3f98045 is in history

Change-Id: Ia67d7cfda37f331b700ba1fdb9c3ac47474c8ad4