Merge "Remove visibility and show race condition." into tm-qpr-dev am: c1ed09a3

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



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