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

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



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