Merge "Add a setting to support for NITZ retention" am: bff4c1b433 am: 696e4a715c am: a2e45b350e

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

Change-Id: I57cacf2fcedddd2ccca9a3048f8b9b95b1c9c778