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 am: b26c4dd2

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



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