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

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

Change-Id: I68d9814ee6685ee5110b9932ebd2a3b43b7fcca1