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
Change-Id: Ia70051c89f6ca5e3215ffc9642ebb29a72fe3162