Merge "Load APN configure file from product image preferentially instead of system image"
am: 60d936454b

Change-Id: Id3f9d3383e81eb9cd421524f3a0ac18684741616