Revert "frame_number when key_frame + show_frame"

This reverts commit 9f14e61eea702b494560c297609b150db933b411.

Reason for revert: results in failures related to Forward keyframes: https://gitlab.com/AOMediaCodec/avm/-/issues/1132

STATS_CHANGED

Closes #1132 

Reopens #1110

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 294f55a..dc4ef4f 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5007,11 +5007,12 @@
   memcpy(cm->remapped_ref_idx, frame_params->remapped_ref_idx,
          INTER_REFS_PER_FRAME * sizeof(*cm->remapped_ref_idx));
 
+#if !CONFIG_F024_KEYOBU
   if (av1_is_shown_keyframe(cpi, current_frame->frame_type)) {
     current_frame->key_frame_number += current_frame->frame_number;
     current_frame->frame_number = 0;
   }
-
+#endif
 #if CONFIG_F024_KEYOBU
   cm->current_frame.cm_obu_type = frame_params->frame_params_obu_type;
 #endif