Merge changes from topic "presubmit-am-d782befcd8b04af6aed687af46a7c95a"
* changes:
[automerge] Implement extra persistence layer for widget provider info 2p: 09ddda9f 2p: 24a37075
[automerge] Implement extra persistence layer for widget provider info 2p: 09ddda9f
Implement extra persistence layer for widget provider info