Merge "Use static initializer for CUJ mapping" into udc-dev am: fad846b3 am:...

Merge "Use static initializer for CUJ mapping" into udc-dev am: fad846b3 am: acee830c am: 95484196 am: 7fdd7ba2

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



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