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

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



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