Merge "Treat mcx apn type as not wild-cardable."
am: 61841ba690

Change-Id: I422e025bcacbae3f0c52b71f3e21d3881a42d553