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

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



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