[automerger skipped] Merge "Ignore testShowHideInSameFrame on T" into tm-dev...

[automerger skipped] Merge "Ignore testShowHideInSameFrame on T" into tm-dev am: b0ca1b2d am: 52c6d320 -s ours

am skip reason: Merged-In I7a66fd84e4094be249714c2597706ee25938adbe with SHA-1 9053d728 is already in history

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



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