Merge "Removing some shortcut mappings that didn't make to UDC in system info"...

Merge "Removing some shortcut mappings that didn't make to UDC in system info" into udc-dev am: dc3a5f1e am: 8bfb3bdc am: caeb9eb2

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



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