Merge "Change the flat request matching logic" into udc-dev am: 62dcc13a

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



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