Merge "Current (5) matrix: use radio.config@1.2::IRadioConfig" into qt-dev-plus-aosp am: f41233f7fd
am: 28ba8ec8e2

Change-Id: I45e949c156a27930cec0f1f6e31caf2bbcb3b64d