[automerger] Merge "Add corresponding error code to fix vts test" into oreo-vts-dev am: 91c4ebbd6f  -s ours am: bfbbf84893

Change-Id: Ie227376c0186814d03323ce7fb299b903f6de741