Merge "Store original values of replaced settings in Settings.Secure" into...

Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fb am: 62bdcabe am: 8be850ea am: b0a56d98

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

Change-Id: Ib585917b16fb8413824d60d59c92e8f699ecde3f