Merge "[automerger skipped] check_ms_os_desc: fix buffer overflow. am:...

Merge "[automerger skipped] check_ms_os_desc: fix buffer overflow. am: a311f786 am: d8344c18 am: ce9f335b -s ours" into rvc-qpr-dev-plus-aosp am: c3cba3b2 -s ours

am skip reason: Change-Id Ie99715ab62571d24460c3a1fb859d22951f30cb8 with SHA-1 a311f786 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11726469

Change-Id: I010e1736cd763025a45cf98a27a4cfc85dfd14f9