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

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

Change-Id: I4267e69090b0018aa8076768da3801605ceb3b35