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

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



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