Merge "Mark Restricted APN connections as restricted." am: b90b2015d3
am: 1778682242

Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f