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: c48f5ae0 am: 67be8eb2
Change-Id: Ie393125332912b9ea8f046165f5dbf19ed350336