[automerger skipped] Add more error codes. am: 12e0e6d24b -s ours
am skip reason: Change-Id I6f386bfcf75236e30141fab89e2b62ee3a8cb59e with SHA-1 8cbbed00df is in history

Change-Id: Ic9a3d18a0e2c64d8407e068d3777963c66e870fd