[automerger skipped] Merge "Add ":sphal" as required in apex_manifest.json" into mainline-prod am: 6a3cb34788 -s ours

am skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9c7 is in history

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

Change-Id: I13725d4c4bb183653346cd90971e4dfa43a2ffac