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

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

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