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: 0643986d am: f4fc00db

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



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