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

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



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