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

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

Change-Id: I728cabb9e07913e54f92e3b5a720b8e3fafbf6fc