Merge "Convert preview sdkVersion to int for target-api" into main am: 1e079dfdf2 am: 4f2fc4528b am: 22956f15bd am: 872271f99d

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

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