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

Change-Id: I0c754a8adbad34e8d8fe0ead336de57ae0859128