Merge "Remove separate_platform_variant entries." am: ae6b04cf84

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

Change-Id: If3b43fb87646b03943f9c076ab9b608e33bdc19b