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

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

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