Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc am: e0d552c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030765



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