Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c93

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084725

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