Merge "Merge "Add atom for a janky event reported by SurfaceFlinger." into rvc-dev am: 28a0b857" into rvc-dev-plus-aosp