Merge "Replace #apex with #systemapi" am: 777c8f5b am: adcc29f7 am:...

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

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



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