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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaae7e5a9a5e3791dab05723e356a68ed4b5ef753