Merge "[DO NOT MERGE] Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-f-dev
am: 0df86bee98

Change-Id: Ib36de01382d60c9504c97ed890a4e2421859abea