Merge pull request #26591 from philipqnguyen/changelog-fix-etag-template

Add #25546 and #25817 to changelog [ci skip]

actionpack/CHANGELOG.md

+*   Fix adding implicitly rendered template digests to ETags.
+
+    Fixes a case when modifying an implicitly rendered template for a
+    controller action using `fresh_when` or `stale?` would not result in a new
+    `ETag` value.
+
+    *Javan Makhmali*
+
 *   Make `fixture_file_upload` work in integration tests.
 
     *Yuji Yaginuma*