[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 udc-dev am: 4a584df0 am: 04cbe370 am: f1f74e26 -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/+/31172435



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