[automerger skipped] Add new satellite error codes am: b7609c16 -s ours

am skip reason: Merged-In Ib61f4ad02e7d963a1de32e60b5e363ec1170aaed with SHA-1 8d3eaae6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27905782



Change-Id: I320f64ac5b024a485a6741b8a4cafa5733029056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>