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

Change-Id: I9d22adac20bb486a45cf1d3b3be14c6c12021662