Merge "Implement extra persistence layer for widget provider info" into tm-dev...

Merge "Implement extra persistence layer for widget provider info" into tm-dev am: a710d8fe am: 9b2ef4e0

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



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