Merge "Added test for version check" am: 13af2f46a8 am: c36aa998a4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2534111

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