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

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



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