Merge "Make sure APN type ALL does not include types that are not wild cardable"
am: 0d4f48f49d

Change-Id: Icc3d660c4639490adaf275a7bbc744ac1c8dfff1