Merge "Replace #apex with #systemapi" am: 777c8f5bff

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

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