Merge "Ensure that setVisibility is the" into tm-qpr-dev am: 453faac20f am: cfdc4ea3b2

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

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