Remove separate_platform_variant entries. am: a049eb0faf am: 08643bdf3a am: d01346a45c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1927650

Change-Id: I6e24f0acc9ba9ed9d70b670a12568b0d1982392b