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

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

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



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