[automerger skipped] Merge "Create test app that mimics GMail" into tm-qpr-dev...

[automerger skipped] Merge "Create test app that mimics GMail" into tm-qpr-dev am: e4be54bd am: c8126b85 -s ours

am skip reason: Merged-In Ic7259007c1e6fc3991fc799a62816749b0b64c62 with SHA-1 3fcfa06a is already in history

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



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