Merge "Remove separate_platform_variant entries." am: ae6b04cf am:...

Merge "Remove separate_platform_variant entries." am: ae6b04cf am: 80e21822 am: cbc012a6 am: 78acddef

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

Change-Id: I6f9ba2a59508ee32c1e404249df61145a982a850