Merge "Fix crash when DocumentsProviders using duplicate authority exist" into pi-dev
am: 0d75c67aff

Change-Id: I633081af658293e1f6b64fd026c9497c7ee0bf3b