Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001 am:...

Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001 am: f4f0c7d5 am: 6ac637dc am: 3f1589bd

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



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