Merge "SF: Clean up ftl::SmallMap lookup fallbacks" into udc-dev am: 50355837d2 am: b8736d102a

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

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