Merge "Add configuration possibilities for Emergency SOS" am: ee4ed803 am:...

Merge "Add configuration possibilities for Emergency SOS" am: ee4ed803 am: 5a81df5c am: 03939123

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



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