Merge "Adopt prev preferred APN on APN reset" into tm-qpr-dev am: 5be5ea1c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/19417707



Change-Id: I24e19771646cfacc11164730666de94d78b1fd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>