Merge changes from topics "libjnigraphics-fix-history",...

Merge changes from topics "libjnigraphics-fix-history", "validate-version-script-stub-tags" into main am: ec4bfb02

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2887226



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