Merge "Revert "Revert "[SettingsProvider] tracking generation of non-pr...""...

Merge "Revert "Revert "[SettingsProvider] tracking generation of non-pr..."" into udc-dev am: 981f0d97

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



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