Merge "Merge "Fix bug that getBaseBandVersion() may write the value...
Merge "Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." into rvc-dev am: b7efa560 am: 64439fab" into rvc-d1-dev-plus-aosp am: 3881c749 am: a6a308e2
Change-Id: Idada5aedf6a30fdd0fb114ed39be4af559b2ae39