Merge "Fix visitor" into main am: 004bccd97c am: d83c544d81

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2800293

Change-Id: I898d358e0b2fe3a79459f4f5f714d89fb0f24a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>