Merge "Bug: 22567809 CTS: Fugu: android.text.format.cts related tests failing" into mnc-dev