Remove separate_platform_variant entries. am: a049eb0faf am: 08643bdf3a

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

Change-Id: I09ad459cc44df4425618feafdc00e08882fb3dfb