[automerger skipped] Merge "Merge "Add atom for a janky event reported by...

[automerger skipped] Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857" into rvc-dev-plus-aosp am: 4a92dbdd -s ours am: 2fe4cde3 -s ours
am skip reason: Change-Id I368855e4045c78a0cb65041cca762f4d334de916 with SHA-1 5ac32622 is in history

Change-Id: I5e85541a85167e440feedf97a6123d59f8a3ee86