[automerger skipped] Merge "Prevent unnecessary building APN candidates" am:...
[automerger skipped] Merge "Prevent unnecessary building APN candidates" am: c55fdeb2 am: 84cb5abc
am: b70b40aa -s ours
am skip reason: change_id I8dd8edc6a9485148dde7b9b6b4326baed1632ea4 with SHA1 9a00218d is in history
Change-Id: Id179ae0511fbb4f9402b1c5acd65ce193f2692d8