[automerger skipped] Merge "Update matchAllRuleAllowed flag condition" into...

[automerger skipped] Merge "Update matchAllRuleAllowed flag condition" into udc-qpr-dev am: 4bc5d08b am: 59ed1b46 -s ours

am skip reason: Merged-In I01bf371038393b08382a8924aeecfc089ed17718 with SHA-1 b19759ba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/24680897



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