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

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



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