Merge "Revert^2 "Remove minor version from sepolicy version"" into main am: 2a99c56da1 am: 3fbd20ed36

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

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