[automerger skipped] Merge "Support Gba Api" am: bb8f71cb40 am: 1f74a0a8a4 am: 23b2cb4436 -s ours

am skip reason: Change-Id Ib82637056e7daa451c644bb7a33ed308707b6b53 with SHA-1 641e81c0ad is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1523522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia925475a26db7870adc5f243532b7e889099382b