Merge "add KEY_IGNORE_GLOBAL_PHONE_NUMBER_FORMAT_BOOL" into udc-qpr-dev am: 5e49928b

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



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