Merge "Replace #apex with #systemapi" am: dc5a1d6ba1 am: bf3285cfdb

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2393584

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