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

Change-Id: I81b882265a2dd57ab0414edcece204b5046c41ae