Merge "Fix visitor" into main am: 004bccd97c

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

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