Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fb am: d39b0a73

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

Change-Id: If1ed3524d771f53bf91c5844ef9beea5eeff872f