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

Change-Id: I803a750635fea96e4c39ae0d108f62ebfd7f225c