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

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



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