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

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



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