Merge "Fix dumpsys SurfaceFlinger --frame-events" am: 73ab3a30ac am: 93a3c0b68c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c78f12f9c12feab82f1a676c8b93d313ff6a3c