Merge "Revert^2 "Remove minor version from sepolicy version"" into main am: 2a99c56d

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



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