Merge "Remove unnecessary PROVIDER_CHANGED broadcast on launch"
am: 40cc0c9c1d

Change-Id: I79194c3e79661e311b6f7d33849ed73e1961b1ce