Merge "Support Gba Api" am: 4c9e7a8d0c am: 3c7ba99acf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I994f1e7d5f2ce4e018e8f04c7ffcff7d588f50b0