Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb am: 62bdcabed5

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

Change-Id: Ib249e54d72abe1be32408b90e41b0f96f0d0b81f