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

Change-Id: If6791aeb5d0ec361c7ae754819a4a1c2624398bb