Merge "Added test for version check" am: 13af2f46 am: c36aa998 am: 76aa2000 am: cd7d78c6

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



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