[automerger skipped] Merge "Add ":sphal" as required in apex_manifest.json"...

[automerger skipped] Merge "Add ":sphal" as required in apex_manifest.json" am: 70e96c8d am: c28c6285 -s ours

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

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

Change-Id: I479034bbe60eab4673fd0f9d6c937191b01f9f07