Merge "Replace #apex with #systemapi" am: f3e6cf0a am: 03e341e4 am:...

Merge "Replace #apex with #systemapi" am: f3e6cf0a am: 03e341e4 am: 05506e1f am: f1b3104b am: a8984343

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



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