Merge "Fix MPL matcher to actually match line" into main am: 28a5f9d15f am: 91a0244cfd am: f6203e10e6

Original change: https://android-review.googlesource.com/c/platform/development/+/2885246

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