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

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



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