Merge "Fix wrong report previous country code when releaseing airplane mode"...

Merge "Fix wrong report previous country code when releaseing airplane mode" into udc-qpr-dev am: 7ecd81e4

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



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