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

Merge "Remove incorrect optimization in visibility cache" into rvc-dev am: 0f1076a4 am: 75cb23bf am: ac3d2e05

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

Change-Id: I4a4582ca7c606d3d396ed08d04249530e7656424