Merge "[SettingsProvider] only increment generation of unset settings if new...

Merge "[SettingsProvider] only increment generation of unset settings if new setting is non-predefined" into udc-dev am: 832e36d4

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



Change-Id: Id3f38a1b4e354a92bf0f29e49cee35b20ef37425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>