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

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



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