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

Change-Id: I1a16454045c617db500ba66ce082b68144f91a84