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: f4729ea3

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

Change-Id: I4a8db3a82929585144e110301995067b56cbcccc