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

Change-Id: Ifc032a2dff3402909805cb122693c85fe90d0b41