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

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

Change-Id: I7db4ea86f60ef585674573e69392af0d8f9325b5