[automerger skipped] Merge "Introduce erase modem config api" into qt-qpr1-dev
am: fc2b1dee -s ours
am skip reason: change_id I55d9d1d84ab48fa494d42c22b0d3ac7657f8c44f with SHA1 15d2b5ee is in history
Change-Id: I524b2b8cf491166b727c28923b8d3f4480093b27