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 am: d08ec6ac

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

Change-Id: If79e988a1d3e2b30da0a0fe61cd6c99b9a5067a7