Merge "[Media ML] Remove hidden API usage in SystemServer"