Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am: 3f258857b5

Change-Id: I630ce087dab01e065c0f9acb9c32c5c99008e030