Merge "Modify Script matching algorithm" into udc-dev am: cbb43d66 am: 60f761ab

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



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