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

Change-Id: I3a07437d3597e77a770ebd2beda56f127497708d