Merge "Replace #apex with #systemapi" am: 2dd8933868

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

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