[automerger skipped] Merge "Created a test app that mimics game app." into...

[automerger skipped] Merge "Created a test app that mimics game app." into tm-qpr-dev am: f5ee8436 am: 94e7493d -s ours

am skip reason: Merged-In Iaee9fee5a343df0544057de485e9d6092b69b483 with SHA-1 e98b9a52 is already in history

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



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