Merge "Permit privileged system apps to send SMS without persisting." am: 3d5504724f
am: 6c567af893

Change-Id: I1a891d3d8abbf506a91a0236fa7380cfa143e988