Merge "Remove sdk_version if platform_apis is set" am: ac9b9911 am:...

Merge "Remove sdk_version if platform_apis is set" am: ac9b9911 am: 3e589c33 am: 197bbecd am: 132ca2c3

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



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