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

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

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