[automerger skipped] Merge "AudioFormat: Add ENCODING_PCM_32BIT ENCODING_PCM_24BIT_PACKED" am: e468f6c1 am: 32010fbb am: 9fe576be -s ours am: 72ef374b -s ours

am skip reason: skip tag Change-Id I92a099e98dd20ef900765928cbacea5e8a940c3c with SHA-1 cec9647e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670486

Change-Id: Ie8452c16a55f750aea4e0cfdf5d2a24c127c9ce1