[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885

Bug: 262898801
Change-Id: Iab7144cf0ece4e538cda5e0a56e87d764b48dc66