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

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

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