Merge "Merge "Allow SMS and calling for demo users" into oc-dr1-dev am: 4387d3a523 am: e5bad6eb25" into oc-mr1-dev-plus-aosp
am: 61ecfae7af

Change-Id: I53592fada1fd5a9f0d5833f51f767e151e178825