Merge "Replace #apex with #systemapi" am: f3e6cf0a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155074



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