Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c am:...

Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c am: 31679bad am: b35091f6

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



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