[automerger skipped] Merge "Support Gba Api" am: 4c9e7a8d0c am: 3c7ba99acf am: 864505529c -s ours

am skip reason: Change-Id I9aea4c8bc2123b6d00c4a8ddf9901c885d2742d2 with SHA-1 b23fb332fc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51bb3d4d266b370d34df103e08611e1b0e495417