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: 9bb639e5

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



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