Merge "[SettingsProvider] tracking generation of non-predefined unset...

Merge "[SettingsProvider] tracking generation of non-predefined unset settings" into udc-dev am: 8f254794

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



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