Merge "Allow context sync to make emergency calls" into udc-dev am: a23febe1 am: 8191eaa6

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



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