Merge "Revert change to defer resetting systemui flags" into sc-dev am: ec84515c am: 72b829eb

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

Change-Id: I68207f29fa40835f7d6ce70378a827cadb4c15a5