Merge "Skip subscription-user association check for emergency sms." into...

Merge "Skip subscription-user association check for emergency sms." into udc-dev am: 8371ad4c am: 656c1eef

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



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