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

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

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