Merge "Statically link VtsFwkDisplayServiceV1_0TargetTest" into rvc-dev am: 2502195fc6 am: fdbc463969

Change-Id: Id634dd6fbb1737110520f218cd6d1947df1fd2ac