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

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

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



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