[automerger skipped] Merge "Systemservice change to propagate userId to MMSService" into main am: 33c1c8b3f9 -s ours

am skip reason: Merged-In I9beb19f1a94aae76e6cd48a72feeb6c1dc47cf5a with SHA-1 3df02a7df8 is already in history

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

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