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

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

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



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