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

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



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