Merge "Fix visitor" into main am: 004bccd97c am: c2792a8aba am: 576eed72c0

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

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