Merge "Remove use_apex_name_macro" am: 440b7a04ac am: f236a83bb0 am: 62f3f177a8 am: 30501902fd

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

Change-Id: I2c1c3af81dc8ecc8626941134bba2a0e1886d5c4