Merge "Remove separate_platform_variant entries." am: ae6b04cf84 am: 80e218226f am: cbc012a6f4

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

Change-Id: I0a0198183b6ea220678d059e478e9e5f331deb68