[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: dbf59af2 am: 6e347e2d -s ours am: 64b322af -s ours

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

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



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