am bc92a28e: resolved conflicts for merge of d71914ed to jb-mr1-dev-plus-aosp

* commit 'bc92a28eb36b09326c0502bf2bc1665604183698':
  Add new APN values for a new operator (Hot Mobile) in Israel. Signed-off-by: tal <talkarliner7@gmail.com>