Merge "Support Gba Api" am: bb8f71cb40 am: 1f74a0a8a4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09cfb9a82a4e52c55f6a05ec3a58bbc7e37c632b