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

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

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



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