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

Change-Id: I74ed12c95cd7f3062dbb2f3375caf8713114618f