Merge "Add the systemserver_fragment to media SDK." am: 12e479b70e am: c6af5600fd am: d869638896

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

Change-Id: Ib3fd61dbbfbdba03b23ad55d6804ea988c6cab68