[automerger skipped] Merge "Ignore testShowHideInSameFrame on T" into tm-dev am: b0ca1b2dd6 am: c063cecef4 -s ours
am skip reason: Merged-In I7a66fd84e4094be249714c2597706ee25938adbe with SHA-1 9053d728be is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21566930
Change-Id: I00c61a41c11d4ff01e776218fb4c8ba2dad0c762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: