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: 996afe04

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



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