[automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690
am:afa7f96768
-s ours am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA12fa0b7ed85
is in history Change-Id: I00ba2c885d3e9a4ac7d6257f0fddc3ca17bc979e
This commit is contained in: