Merge "Remove use_apex_name_macro" am: 440b7a04ac am: f236a83bb0

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

Change-Id: Ib693352b16c595de2534e7b7b25840d3acbf5b10