Merge "Remove incorrect optimization in visibility cache" into rvc-dev am:...

Merge "Remove incorrect optimization in visibility cache" into rvc-dev am: 0f1076a4 am: 90d7ebd4 am: f85f638a

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

Change-Id: I34f829f77dcfe955d1ac5bea1849e4ada5dae09b