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

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

Change-Id: Id6163b067e94c58a516422ec396bd0226d34569a