Merge "Clean up a workaround for product variants" into main am: 54392a54fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3290121

Change-Id: I49ce59cba802dc33938c9a1bd677b70232ba803c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>