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: 196d9919

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



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