Merge "Rename android::apex functions" am: f30487a146 am: 4029951888

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I318288765d9957c20ff07505798dcc9df9169596