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

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

Change-Id: Ib585917b16fb8413824d60d59c92e8f699ecde3f