Merge "Merge "Removing some shortcut mappings that didn't make to UDC in system info" into udc-dev am: dc3a5f1e1a am: 0643986db5 am: e3b627a862" into udc-qpr-dev-plus-aosp am: dcdc230613
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23771395 Change-Id: I2d05b2bfb10e9e68ea88dc29a5df95e2cfa5518e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: