Merge "Replace #apex with #systemapi" am: 777c8f5b am: adcc29f7 am: 7aea64e1 am: 0586474a

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



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