Merge "[conflict] Merge "Remove visibility and show race condition." into...

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

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



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