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

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

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



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