Merge "Remove dup result code descriptions" am: 19ffdb0894 am: 649dcf3e0b am: 4ed77d37f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic06ed2a0e6d594e4231885635ab19e85953d06ac