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

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

Change-Id: Ia0591b7b2b9f605f12c8124fbb3b3734cf75a58a