[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 01d2892bdc -s ours am: db204f3655 -s ours am: 7bfa96a184 -s ours

am skip reason: Merged-In I508f71895a7b9e1f243b3994f27a131d8da8adb6 with SHA-1 7e5d7980fd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libgsm/+/19094253

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