Merge "Replace #apex with #systemapi" am: 1cca540feb am: 2a9c778583 am: 2bb284308a

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

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