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

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



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