Merge "Mark Restricted APN connections as restricted." am: b90b2015d3 am: 1778682242 am: 88a6acb9f6  -s ours
am: 40917c44b2  -s ours

Change-Id: Ieae70ca90bff3747ef66c6f15258fef28d061ce4