Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde

Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I9fda76d7ddf8cd478c7fd1ca4bfeff9dd8f540ab