Merge "Replace #apex with #systemapi" am: b1151361 am: 80cd0a84 am: 7a11de2a

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



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