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

Change-Id: If4545c93b16ad9a6f188280c12ef4ee9bbb353f3