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: 499e8848 am: 2dc9ab9f am: 0e8a3dea

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



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