[automerger skipped] Merge "Add the systemserver_fragment to media SDK." am:...

[automerger skipped] Merge "Add the systemserver_fragment to media SDK." am: 12e479b7 am: c6af5600 am: d8696388 am: 10b7b593 am: 59dbf8d3 -s ours

am skip reason: Merged-In I2cca8b206451858e636c6bd04617cf3933f702c6 with SHA-1 381fb640 is already in history

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

Change-Id: I952507fbbc3beaea2a799daa39c8d5b1d75037be