Merge "Merge "Revert "Update show system experiment behavior."" into tm-dev...

Merge "Merge "Revert "Update show system experiment behavior."" into tm-dev am: 7c4b55cc am: d341afed" into tm-d1-dev-plus-aosp am: 26f46acb am: 1be03e95

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



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