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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155321

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