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

[automerger skipped] Merge "Ignore testShowHideInSameFrame on T" into tm-dev am: b0ca1b2d am: c063cece -s ours am: 5ee2a073 -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: I5a0ba2bd05e9b45c5a9c17bd47ad128cbfaae725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>