Add device config option to switch to strict phone number matcher am: 495b293e66
am: dff316266e

Change-Id: I006c43760e8828f44b516bf5397ea47630261a5d