Merge "Do not use hard-coded apex name" into main am: c2e6966523

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

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