Merge "Use std::map for fallback keys" into udc-dev am: c5233627 am: 58f09a67

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



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