[automerger skipped] Merge "Hide SAW subwindows" into tm-dev am: 61a992c6...

[automerger skipped] Merge "Hide SAW subwindows" into tm-dev am: 61a992c6 am: 619d137a -s ours am: 62494812 -s ours am: 655628d8 -s ours

am skip reason: Merged-In If19240f5aec2e048de80d75cbbdc00be47622d7f with SHA-1 55d02153 is already in history

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



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