[automerger skipped] Merge "Remove incorrect call to Window.addFlags with a...

[automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f23 am: c2c7c0d9 -s ours am: 8a9a9fd4 -s ours

am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727



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