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

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

Change-Id: I881fb29c9172145bc6ea24d7f6fec1d60222e623