[automerger skipped] Merge "Add more error codes." into qt-qpr1-dev-plus-aosp am: 2abcb6be3f -s ours
am skip reason: Change-Id I6f386bfcf75236e30141fab89e2b62ee3a8cb59e with SHA-1 12e0e6d24b is in history

Change-Id: Ic74b63394bf14fe701e04ec07dfc99a407e8b511