[automerger skipped] Merge changes from topic "mvno_matching" am: a5fa62bc am: 5b206b81 -s ours

am skip reason: Merged-In I274d88338ac4f15a4458e035af0e5c0b278f9c1b with SHA-1 d3afcd85 is already in history

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



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