Merge "[automerger skipped] RESTRICT AUTOMERGE Ignore testShowHideInSameFrame...

Merge "[automerger skipped] RESTRICT AUTOMERGE Ignore testShowHideInSameFrame on T QPR am: 89a5d830 -s ours am: 1b43f2a2 -s ours" into udc-dev-plus-aosp am: 9764b6f9 am: 9efeecd6

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



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