Merge "DO NOT MERGE Resolve merge conflict for VtsHalCameraProviderV2_4TargetTest.cpp" into oreo-vts-dev am: c85833780f  -s ours am: eebf378ccf
am: 4b4f6e6ec5

Change-Id: I825bc2ad09049deda107c091f4b4a886490ea071