[automerger skipped] Merge "Systemservice change to propagate userId to...

[automerger skipped] Merge "Systemservice change to propagate userId to MMSService" into tm-qpr-dev am: fbdb370f -s ours am: df7a32db -s ours am: 9831edbb -s ours

am skip reason: Merged-In I9beb19f1a94aae76e6cd48a72feeb6c1dc47cf5a with SHA-1 9a933f3b is already in history

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



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