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

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



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