[conflict] Merge "Remove visibility and show race condition." into tm-qpr-dev...

[conflict] Merge "Remove visibility and show race condition." into tm-qpr-dev am: c1ed09a3 am: 50576fe8

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



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