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

Change-Id: I94cbf0ab94401149905290e395ddf71371aac849