Merge pull request #9587 from evanxd/bug-869367

Bug 869367 - [Settings] The screen of Date & Time panel has redundant space when NITZ is NOT available.(cherry picked from commit e2dc1445fe3fb372f6ddc1caeb03489d59ff839b)