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

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

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



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