Merge "Flag off stickiness of show/hide system setting." into tm-dev am:...

Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd am: c92780ce am: a3ecc494

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



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