[automerger skipped] Merge "Remove incorrect call to Window.addFlags with a system flag" into tm-dev am: 98fc4f2356
am: c2c7c0d984
-s ours am: 8a9a9fd424
-s ours
am skip reason: Merged-In I539fca77a1d136bdd0e4892993020884430b8a4e with SHA-1 c97cd9e805
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31189727
Change-Id: Ia8c943358bb53d7645c9743d98916e6a7dbc9408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: