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

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

Change-Id: I33cb2c93e3806512f5d66b753504d2aab6b733ed