[automerger skipped] Merge "Hide SAW subwindows" into sc-v2-dev am: e9e162b0...

[automerger skipped] Merge "Hide SAW subwindows" into sc-v2-dev am: e9e162b0 -s ours am: 84835cbd -s ours am: 7d35bb4c -s ours

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

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



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