Merge "DO NOT MERGE Test sidecar OEM implementation for WM support library"...
Merge "DO NOT MERGE Test sidecar OEM implementation for WM support library" into rvc-dev am: 24cfad9c am: 110ca2ab am: dcdd7754 am: 0455b386
Change-Id: I031171d50a899fb7179459871528e6a3f484977a