Merge "Change the flat request matching logic" into udc-dev am: 62dcc13ac6 am: 01749ce887

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

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