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 am: a00aadf2

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



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