Merge changes from topic "libogg_upgrade" into main am: c0fe8bca28 am: 175c78ee06 am: fd32b1ec3e am: 6318572874

Original change: https://android-review.googlesource.com/c/platform/external/libogg/+/2704404

Change-Id: I050bab26ca39991f708e5bc4f497ac2b4ec51cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>